Rollup of 4 pull requests #140350

jhpratt · 2025-04-26T21:44:02Z

Successful merges:

add autodiff inline #139308 (add autodiff inline)
Correctly display stdout and stderr in case a doctest is failing #140291 (Correctly display stdout and stderr in case a doctest is failing)
Update example to use CStr::to_string_lossy #140297 (Update example to use CStr::to_string_lossy)
session: Cleanup CanonicalizedPath::new #140339 (session: Cleanup CanonicalizedPath::new)

r? @ghost
@rustbot modify labels: rollup

It wants an owned path, so pass an owned path

…-inline, r=ZuseZ4 add autodiff inline closes: rust-lang#138920 r? `@ZuseZ4`

…, r=notriddle Correctly display stdout and stderr in case a doctest is failing Fixes rust-lang#140289. Since the doctest is actually running itself, we need to handle the output directly inside it. cc `@fmease` r? `@notriddle`

Update example to use CStr::to_string_lossy

session: Cleanup `CanonicalizedPath::new` It wants an owned path, so pass an owned path.

jhpratt · 2025-04-26T21:44:09Z

@bors r+ rollup p=4

bors · 2025-04-26T21:44:11Z

📌 Commit 60316bf has been approved by jhpratt

It is now in the queue for this repository.

bors · 2025-04-26T22:16:33Z

⌛ Testing commit 60316bf with merge ad2aaa8...

Rollup of 4 pull requests Successful merges: - rust-lang#139308 (add autodiff inline) - rust-lang#140291 (Correctly display stdout and stderr in case a doctest is failing) - rust-lang#140297 (Update example to use CStr::to_string_lossy) - rust-lang#140339 (session: Cleanup `CanonicalizedPath::new`) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2025-04-26T22:32:11Z

The job dist-aarch64-linux failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

   Compiling rustc_codegen_llvm v0.0.0 (/checkout/compiler/rustc_codegen_llvm)
error[E0308]: mismatched types
   --> compiler/rustc_codegen_llvm/src/back/lto.rs:677:54
    |
677 |             if attributes::has_string_attr(function, marker_ptr) {
    |                ---------------------------           ^^^^^^^^^^ expected `*const i8`, found `*const u8`
    |                |
    |                arguments to this function are incorrect
    |
    = note: expected raw pointer `*const i8`
               found raw pointer `*const u8`
note: function defined here
   --> compiler/rustc_codegen_llvm/src/attributes.rs:35:15
    |
35  | pub(crate) fn has_string_attr(llfn: &Value, name: *const i8) -> bool {
    |               ^^^^^^^^^^^^^^^               ---------------

error[E0308]: mismatched types
   --> compiler/rustc_codegen_llvm/src/back/lto.rs:685:68
    |
685 |                 attributes::remove_string_attr_from_llfn(function, marker_ptr);
    |                 ----------------------------------------           ^^^^^^^^^^ expected `*const i8`, found `*const u8`
    |                 |
    |                 arguments to this function are incorrect
    |
    = note: expected raw pointer `*const i8`
               found raw pointer `*const u8`
note: function defined here
   --> compiler/rustc_codegen_llvm/src/attributes.rs:43:15
    |
43  | pub(crate) fn remove_string_attr_from_llfn(llfn: &Value, name: *const i8) {
    |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^               ---------------

error[E0308]: mismatched types
   --> compiler/rustc_codegen_llvm/src/back/lto.rs:688:60
    |
688 |                     !attributes::has_string_attr(function, marker_ptr),
    |                      ---------------------------           ^^^^^^^^^^ expected `*const i8`, found `*const u8`
    |                      |
    |                      arguments to this function are incorrect
    |
    = note: expected raw pointer `*const i8`
               found raw pointer `*const u8`
note: function defined here
   --> compiler/rustc_codegen_llvm/src/attributes.rs:35:15
    |
35  | pub(crate) fn has_string_attr(llfn: &Value, name: *const i8) -> bool {
    |               ^^^^^^^^^^^^^^^               ---------------

error[E0308]: mismatched types
  --> compiler/rustc_codegen_llvm/src/llvm/mod.rs:53:43
   |
53 |     unsafe { LLVMRustHasFnAttribute(llfn, name) }
   |              ----------------------       ^^^^ expected `*const u8`, found `*const i8`
   |              |
   |              arguments to this function are incorrect
   |
   = note: expected raw pointer `*const u8`
              found raw pointer `*const i8`
note: function defined here
  --> compiler/rustc_codegen_llvm/src/llvm/enzyme_ffi.rs:22:19
   |
22 |     pub(crate) fn LLVMRustHasFnAttribute(F: &Value, Name: *const c_char) -> bool;
   |                   ^^^^^^^^^^^^^^^^^^^^^^            ----

error[E0308]: mismatched types
  --> compiler/rustc_codegen_llvm/src/llvm/mod.rs:57:46
   |
57 |     unsafe { LLVMRustRemoveFnAttribute(llfn, name) }
   |              -------------------------       ^^^^ expected `*const u8`, found `*const i8`
   |              |
   |              arguments to this function are incorrect
   |
   = note: expected raw pointer `*const u8`
              found raw pointer `*const i8`
note: function defined here
  --> compiler/rustc_codegen_llvm/src/llvm/enzyme_ffi.rs:23:19
   |
23 |     pub(crate) fn LLVMRustRemoveFnAttribute(F: &Value, Name: *const c_char);
   |                   ^^^^^^^^^^^^^^^^^^^^^^^^^            ----

For more information about this error, try `rustc --explain E0308`.
[RUSTC-TIMING] rustc_codegen_llvm test:false 2.422
error: could not compile `rustc_codegen_llvm` (lib) due to 5 previous errors
---
   1: std::backtrace_rs::backtrace::trace_unsynchronized
             at /rustc/45165c82a4c5315ff52c391ad138f41ff40b52d8/library/std/src/../../backtrace/src/backtrace/mod.rs:66:14
   2: std::backtrace::Backtrace::create
             at /rustc/45165c82a4c5315ff52c391ad138f41ff40b52d8/library/std/src/backtrace.rs:331:13
   3: <anyhow::Error>::msg::<alloc::string::String>
             at /rust/deps/anyhow-1.0.97/src/backtrace.rs:27:14
   4: <opt_dist::exec::CmdBuilder>::run
             at /rustc/ad2aaa8c61cabdf2f967b54c5057d8b9d20268e3/src/tools/opt-dist/src/exec.rs:80:17
   5: <opt_dist::exec::Bootstrap>::run
             at /rustc/ad2aaa8c61cabdf2f967b54c5057d8b9d20268e3/src/tools/opt-dist/src/exec.rs:181:9
   6: opt_dist::execute_pipeline::{closure#1}::{closure#0}
             at /rustc/ad2aaa8c61cabdf2f967b54c5057d8b9d20268e3/src/tools/opt-dist/src/main.rs:230:13
   7: <opt_dist::timer::TimerSection>::section::<opt_dist::execute_pipeline::{closure#1}::{closure#0}, ()>
             at /rustc/ad2aaa8c61cabdf2f967b54c5057d8b9d20268e3/src/tools/opt-dist/src/timer.rs:111:22
   8: opt_dist::execute_pipeline::{closure#1}
             at /rustc/ad2aaa8c61cabdf2f967b54c5057d8b9d20268e3/src/tools/opt-dist/src/main.rs:219:9
   9: <opt_dist::timer::TimerSection>::section::<opt_dist::execute_pipeline::{closure#1}, opt_dist::training::RustcPGOProfile>
             at /rustc/ad2aaa8c61cabdf2f967b54c5057d8b9d20268e3/src/tools/opt-dist/src/timer.rs:111:22
  10: opt_dist::execute_pipeline
             at /rustc/ad2aaa8c61cabdf2f967b54c5057d8b9d20268e3/src/tools/opt-dist/src/main.rs:216:29
  11: opt_dist::main
             at /rustc/ad2aaa8c61cabdf2f967b54c5057d8b9d20268e3/src/tools/opt-dist/src/main.rs:416:18
  12: <fn() -> core::result::Result<(), anyhow::Error> as core::ops::function::FnOnce<()>>::call_once
             at /rustc/45165c82a4c5315ff52c391ad138f41ff40b52d8/library/core/src/ops/function.rs:250:5
  13: std::sys::backtrace::__rust_begin_short_backtrace::<fn() -> core::result::Result<(), anyhow::Error>, core::result::Result<(), anyhow::Error>>
             at /rustc/45165c82a4c5315ff52c391ad138f41ff40b52d8/library/std/src/sys/backtrace.rs:152:18
  14: std::rt::lang_start::<core::result::Result<(), anyhow::Error>>::{closure#0}
             at /rustc/45165c82a4c5315ff52c391ad138f41ff40b52d8/library/std/src/rt.rs:199:18
  15: core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &F>::call_once
             at /rustc/45165c82a4c5315ff52c391ad138f41ff40b52d8/library/core/src/ops/function.rs:284:13
  16: std::panicking::try::do_call
             at /rustc/45165c82a4c5315ff52c391ad138f41ff40b52d8/library/std/src/panicking.rs:589:40
  17: std::panicking::try
             at /rustc/45165c82a4c5315ff52c391ad138f41ff40b52d8/library/std/src/panicking.rs:552:19

bors · 2025-04-26T22:32:49Z

💔 Test failed - checks-actions

Shourya742 and others added 11 commits April 25, 2025 11:09

add llvm wrappers and corresponding methods in attribute

f319dd9

add custom enzyme markers to target methods

9bc0401

Correctly display stdout and stderr in case a doctest is failing

70c389e

Add rustdoc-ui regression test for rust-lang#140289

c44068b

remove noinline attribute and add alwaysinline after AD pass

48d05aa

session: Cleanup CanonicalizedPath::new

86969db

It wants an owned path, so pass an owned path

Update example to use CStr::to_string_lossy

9112c86

Rollup merge of rust-lang#139308 - Shourya742:2025-03-29-add-autodiff…

7f8b3c0

…-inline, r=ZuseZ4 add autodiff inline closes: rust-lang#138920 r? `@ZuseZ4`

Rollup merge of rust-lang#140297 - shepmaster:cstr-lossy, r=joboet

84f3333

Update example to use CStr::to_string_lossy

Rollup merge of rust-lang#140339 - petrochenkov:capanew, r=lqd

60316bf

session: Cleanup `CanonicalizedPath::new` It wants an owned path, so pass an owned path.

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 26, 2025

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 26, 2025

jhpratt closed this Apr 27, 2025

jhpratt deleted the rollup-fudxv6m branch April 27, 2025 01:26

jhpratt mentioned this pull request Apr 27, 2025

add autodiff inline #139308

Merged

jhpratt mentioned this pull request Apr 27, 2025

Rollup of 8 pull requests #140354

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 4 pull requests #140350

Rollup of 4 pull requests #140350

Uh oh!

jhpratt commented Apr 26, 2025

Uh oh!

jhpratt commented Apr 26, 2025

Uh oh!

bors commented Apr 26, 2025

Uh oh!

bors commented Apr 26, 2025

Uh oh!

rust-log-analyzer commented Apr 26, 2025

Uh oh!

bors commented Apr 26, 2025

Uh oh!

Uh oh!

Rollup of 4 pull requests #140350

Rollup of 4 pull requests #140350

Uh oh!

Conversation

jhpratt commented Apr 26, 2025

Uh oh!

jhpratt commented Apr 26, 2025

Uh oh!

bors commented Apr 26, 2025

Uh oh!

bors commented Apr 26, 2025

Uh oh!

rust-log-analyzer commented Apr 26, 2025

Uh oh!

bors commented Apr 26, 2025

Uh oh!

Uh oh!